projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee9a6d0)
Revert "Visual Studio Builds: "Install" the Stock Icons"
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 1 Jul 2014 07:52:34 +0000 (15:52 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 1 Jul 2014 07:52:34 +0000 (15:52 +0800)
The stock icons are now built into the GTK+ DLL via resources, so don't
try to install the stock icons, and the icons don't reside in their former
positions anymore, causing messages indicating that the files cannot be
found.

This reverts commit 2e0ce67f8aa7da0cfbcf31e02e60012927fb4193.

build/win32/vs10/gtk-install.props patch | blob | history
build/win32/vs9/gtk-install.vsprops patch | blob | history

diff --git a/build/win32/vs10/gtk-install.props b/build/win32/vs10/gtk-install.props
index 5e7782a50be80b778eeb1afb33306a6d5162b280..2d88e98ee5ebcc1714eafd1123d4ca8cd4808d06 100644 (file)
--- a/build/win32/vs10/gtk-install.props
+++ b/build/win32/vs10/gtk-install.props
@@ -771,16 +771,6 @@ mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
 copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\
 
 
-mkdir $(CopyDir)\share\icons\hicolor\16x16\actions
-
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\16x16\actions\
-
-
-mkdir $(CopyDir)\share\icons\hicolor\20x20\actions
-
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\20x20\actions\
-
-
 mkdir $(CopyDir)\share\icons\hicolor\22x22\apps
 
 copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\
@@ -791,31 +781,16 @@ mkdir $(CopyDir)\share\icons\hicolor\24x24\apps
 copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\
 
 
-mkdir $(CopyDir)\share\icons\hicolor\24x24\actions
-
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\24x24\actions\
-
-
 mkdir $(CopyDir)\share\icons\hicolor\32x32\apps
 
 copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\
 
 
-mkdir $(CopyDir)\share\icons\hicolor\32x32\actions
-
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\32x32\actions\
-
-
 mkdir $(CopyDir)\share\icons\hicolor\48x48\apps
 
 copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\
 
 
-mkdir $(CopyDir)\share\icons\hicolor\48x48\actions
-
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\48x48\actions\
-
-
 mkdir $(CopyDir)\share\icons\hicolor\256x256\apps
 
 copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\
diff --git a/build/win32/vs9/gtk-install.vsprops b/build/win32/vs9/gtk-install.vsprops
index 63ac80667e0c9cc2607090a4cbd19ba3722e733e..284f78b962b786ea22b47dade0cd9f80e4fa4cf1 100644 (file)
--- a/build/win32/vs9/gtk-install.vsprops
+++ b/build/win32/vs9/gtk-install.vsprops
@@ -398,33 +398,18 @@ copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-$(ApiVersion)\
 mkdir $(CopyDir)\share\icons\hicolor\16x16\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\16x16\gtk3-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\&#x0D;&#x0A;
 
-mkdir $(CopyDir)\share\icons\hicolor\16x16\actions&#x0D;&#x0A;
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\16x16\actions\&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\icons\hicolor\20x20\actions&#x0D;&#x0A;
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\20x20\actions\&#x0D;&#x0A;
-
 mkdir $(CopyDir)\share\icons\hicolor\22x22\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\22x22\gtk3-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\&#x0D;&#x0A;
 
 mkdir $(CopyDir)\share\icons\hicolor\24x24\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\24x24\gtk3-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\&#x0D;&#x0A;
 
-mkdir $(CopyDir)\share\icons\hicolor\24x24\actions&#x0D;&#x0A;
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\24x24\actions\&#x0D;&#x0A;
-
 mkdir $(CopyDir)\share\icons\hicolor\32x32\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\32x32\gtk3-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\&#x0D;&#x0A;
 
-mkdir $(CopyDir)\share\icons\hicolor\32x32\actions&#x0D;&#x0A;
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\32x32\actions\&#x0D;&#x0A;
-
 mkdir $(CopyDir)\share\icons\hicolor\48x48\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\48x48\gtk3-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\&#x0D;&#x0A;
 
-mkdir $(CopyDir)\share\icons\hicolor\48x48\actions&#x0D;&#x0A;
-copy ..\..\..\gtk\stock-icons\*.png $(CopyDir)\share\icons\hicolor\48x48\actions\&#x0D;&#x0A;
-
 mkdir $(CopyDir)\share\icons\hicolor\256x256\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\&#x0D;&#x0A;
 
Unnamed repository; edit this file 'description' to name the repository.